Discard configure events from SubstructureNotify. (#81760, Rich Burridge)

Tue May 14 11:21:19 2002  Owen Taylor  <otaylor@redhat.com>

        * gdk/x11/gdkevents-x11.c (gdk_event_translate):
        Discard configure events from SubstructureNotify.
        (#81760, Rich Burridge)

        * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
        strcmp().

        * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp
	width of child allocation to >= 1. (Fixes warnings from
        #77639, Martin Schulze)

diff --git a/ChangeLog b/ChangeLog
index 19e9ebef4b9df4c5d65733130fe07ca165a44be7..70955ff434536393239eb3392c982b2f3487454b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+Tue May 14 11:21:19 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): 
+       Discard configure events from SubstructureNotify.
+       (#81760, Rich Burridge)
+ 
+       * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
+       strcmp().
+ 
+       * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp 
+       width of child allocation to >= 1. (Fixes warnings from
+       #77639, Martin Schulze)
+       
 2002-05-14  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_class_install_child_property): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 19e9ebef4b9df4c5d65733130fe07ca165a44be7..70955ff434536393239eb3392c982b2f3487454b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,16 @@
+Tue May 14 11:21:19 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): 
+       Discard configure events from SubstructureNotify.
+       (#81760, Rich Burridge)
+ 
+       * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
+       strcmp().
+ 
+       * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp 
+       width of child allocation to >= 1. (Fixes warnings from
+       #77639, Martin Schulze)
+       
 2002-05-14  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_class_install_child_property): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 19e9ebef4b9df4c5d65733130fe07ca165a44be7..70955ff434536393239eb3392c982b2f3487454b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,16 @@
+Tue May 14 11:21:19 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): 
+       Discard configure events from SubstructureNotify.
+       (#81760, Rich Burridge)
+ 
+       * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
+       strcmp().
+ 
+       * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp 
+       width of child allocation to >= 1. (Fixes warnings from
+       #77639, Martin Schulze)
+       
 2002-05-14  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_class_install_child_property): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 19e9ebef4b9df4c5d65733130fe07ca165a44be7..70955ff434536393239eb3392c982b2f3487454b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,16 @@
+Tue May 14 11:21:19 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): 
+       Discard configure events from SubstructureNotify.
+       (#81760, Rich Burridge)
+ 
+       * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
+       strcmp().
+ 
+       * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp 
+       width of child allocation to >= 1. (Fixes warnings from
+       #77639, Martin Schulze)
+       
 2002-05-14  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_class_install_child_property): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 19e9ebef4b9df4c5d65733130fe07ca165a44be7..70955ff434536393239eb3392c982b2f3487454b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,16 @@
+Tue May 14 11:21:19 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): 
+       Discard configure events from SubstructureNotify.
+       (#81760, Rich Burridge)
+ 
+       * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
+       strcmp().
+ 
+       * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp 
+       width of child allocation to >= 1. (Fixes warnings from
+       #77639, Martin Schulze)
+       
 2002-05-14  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_class_install_child_property): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 19e9ebef4b9df4c5d65733130fe07ca165a44be7..70955ff434536393239eb3392c982b2f3487454b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,16 @@
+Tue May 14 11:21:19 2002  Owen Taylor  <otaylor@redhat.com>
+ 
+       * gdk/x11/gdkevents-x11.c (gdk_event_translate): 
+       Discard configure events from SubstructureNotify.
+       (#81760, Rich Burridge)
+ 
+       * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not
+       strcmp().
+ 
+       * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp 
+       width of child allocation to >= 1. (Fixes warnings from
+       #77639, Martin Schulze)
+       
 2002-05-14  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcontainer.c (gtk_container_class_install_child_property): 

diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 181b9fea1da5281f101a0bde4aba943259513d6e..04a671bee4639190ac4942d1950665560c1a1411 100644 (file)
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -1382,13 +1382,17 @@ gdk_event_translate (GdkDisplay *display,
                           ? " (discarding)"
                           : GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD
                           ? " (discarding child)"
+                          : xevent->xconfigure.event != xevent->xconfigure.window
+                          ? " (discarding substructure)"
                           : ""));
       if (window &&
+         xevent->xconfigure.event == xevent->xconfigure.window &&
          !GDK_WINDOW_DESTROYED (window) &&
          (window_private->extension_events != 0))
        _gdk_input_configure_event (&xevent->xconfigure, window);
 
       if (!window ||
+         xevent->xconfigure.event != xevent->xconfigure.window ||
           GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD ||
           GDK_WINDOW_TYPE (window) == GDK_WINDOW_ROOT)
        return_val = FALSE;

diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index f46e2ccb26bd2f9a7dc9c47b8e93bde5b8036483..19d4b74816ceae46ee9549a4fc849eacaefc97c3 100644 (file)
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -670,7 +670,7 @@ cmp_families (const void *a, const void *b)
   const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a);
   const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b);
   
-  return strcmp (a_name, b_name);
+  return g_utf8_collate (a_name, b_name);
 }
 
 static void

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index ec34f441bfd4b6fe6efd4b2714d9d7ea24723810..118e7009baf0237d6bf698902c25dc70707d2b6b 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -515,6 +515,9 @@ gtk_menu_item_size_allocate (GtkWidget     *widget,
       if (menu_item->submenu && menu_item->show_submenu_indicator)
        child_allocation.width -= child_requisition.height;
 
+      if (child_allocation.width < 1)
+       child_allocation.width = 1;
+
       gtk_widget_size_allocate (bin->child, &child_allocation);
     }